From 4200bed6be8e63586693ef1f4f817da1522b4207 Mon Sep 17 00:00:00 2001 From: Federico Mena Quintero Date: Wed, 2 Feb 2005 00:53:10 +0000 Subject: [PATCH] Merged from gtk-2-6: 2005-02-01 Federico Mena Quintero Merged from gtk-2-6: * gtk/gtkfilechooserdefault.c (browse_files_model_finished_loading_cb): Don't g_assert_not_reached() if we are in any other state. Another code path may have triggered a folder reload. Fixes #165556. --- ChangeLog | 9 +++++++++ ChangeLog.pre-2-10 | 9 +++++++++ ChangeLog.pre-2-8 | 9 +++++++++ gtk/gtkfilechooserdefault.c | 7 ++++++- 4 files changed, 33 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 260284db9d..605529304e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2005-02-01 Federico Mena Quintero + + Merged from gtk-2-6: + + * gtk/gtkfilechooserdefault.c + (browse_files_model_finished_loading_cb): Don't + g_assert_not_reached() if we are in any other state. Another code + path may have triggered a folder reload. Fixes #165556. + 2005-02-01 Federico Mena Quintero Merged from gtk-2-6: diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 260284db9d..605529304e 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,12 @@ +2005-02-01 Federico Mena Quintero + + Merged from gtk-2-6: + + * gtk/gtkfilechooserdefault.c + (browse_files_model_finished_loading_cb): Don't + g_assert_not_reached() if we are in any other state. Another code + path may have triggered a folder reload. Fixes #165556. + 2005-02-01 Federico Mena Quintero Merged from gtk-2-6: diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 260284db9d..605529304e 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,12 @@ +2005-02-01 Federico Mena Quintero + + Merged from gtk-2-6: + + * gtk/gtkfilechooserdefault.c + (browse_files_model_finished_loading_cb): Don't + g_assert_not_reached() if we are in any other state. Another code + path may have triggered a folder reload. Fixes #165556. + 2005-02-01 Federico Mena Quintero Merged from gtk-2-6: diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c index e55998dc9e..c2e0f8e603 100644 --- a/gtk/gtkfilechooserdefault.c +++ b/gtk/gtkfilechooserdefault.c @@ -4612,7 +4612,12 @@ browse_files_model_finished_loading_cb (GtkFileSystemModel *model, /* Nothing */ } else - g_assert_not_reached (); + { + /* We can't g_assert_not_reached(), as something other than us may have + * initiated a folder reload. See #165556. + */ + return; + } g_assert (impl->load_timeout_id == 0); -- 2.30.2